iconhelper: Use g_clear_* helpers

https://bugzilla.gnome.org/show_bug.cgi?id=709264

diff --git a/gtk/gtkiconhelper.c b/gtk/gtkiconhelper.c
index 2200e3c50364dcce9192a64d028f5b05c88cc185..397ba2f3b8a7e4bff9cc8de9d87e6b41ffc0da0f 100644 (file)
--- a/gtk/gtkiconhelper.c
+++ b/gtk/gtkiconhelper.c
@@ -62,18 +62,8 @@ _gtk_icon_helper_clear (GtkIconHelper *self)
   g_clear_object (&self->priv->animation);
   g_clear_object (&self->priv->rendered_pixbuf);
   g_clear_object (&self->priv->window);
-
-  if (self->priv->orig_surface)
-    {
-      cairo_surface_destroy (self->priv->orig_surface);
-      self->priv->orig_surface = NULL;
-    }
-
-  if (self->priv->rendered_surface)
-    {
-      cairo_surface_destroy (self->priv->rendered_surface);
-      self->priv->rendered_surface = NULL;
-    }
+  g_clear_pointer (&self->priv->orig_surface, cairo_surface_destroy);
+  g_clear_pointer (&self->priv->rendered_surface, cairo_surface_destroy);
 
   if (self->priv->icon_set != NULL)
     {
@@ -83,11 +73,8 @@ _gtk_icon_helper_clear (GtkIconHelper *self)
       self->priv->icon_set = NULL;
     }
 
-  g_free (self->priv->icon_name);
-  self->priv->icon_name = NULL;
-
-  g_free (self->priv->stock_id);
-  self->priv->stock_id = NULL;
+  g_clear_pointer (&self->priv->icon_name, g_free);
+  g_clear_pointer (&self->priv->stock_id, g_free);
 
   self->priv->storage_type = GTK_IMAGE_EMPTY;
   self->priv->icon_size = GTK_ICON_SIZE_INVALID;